gtkwidgetpath: update gtk_widget_path_to_string
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>
Tue, 12 Jan 2016 19:34:56 +0000 (21:34 +0200)
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>
Thu, 14 Jan 2016 22:36:23 +0000 (00:36 +0200)
From gtk_widget_path_iter_set_object_name documentation:
"When set, the object name overrides the object type when matching CSS"

Update gtk_widget_path_to_string to match this behaviour.

gtk/gtkwidgetpath.c

index f28ddc990db8275d5faba05f33e272e0f324970b..f0297dff3284ea6c779b323e0149b22d43a507fc 100644 (file)
@@ -298,7 +298,10 @@ gtk_widget_path_to_string (const GtkWidgetPath *path)
       if (i > 0)
         g_string_append_c (string, ' ');
 
-      g_string_append (string, g_type_name (gtk_css_node_declaration_get_type (elem->decl)));
+      if (gtk_css_node_declaration_get_name (elem->decl))
+        g_string_append (string, gtk_css_node_declaration_get_name (elem->decl));
+      else
+        g_string_append (string, g_type_name (gtk_css_node_declaration_get_type (elem->decl)));
 
       if (gtk_css_node_declaration_get_id (elem->decl))
         {